Can The Two-State Solution Be Saved